Merge "IServiceManager: @nullable IBinder" am: 47322c31db
am: 287399b569

Change-Id: I34af74a89f8525d0aee02d6dbf3bf06dfe8b7732