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

Change-Id: I5d187e806c08968b00ef98080a2611fbdf98c8ac