Merge "Reland 'Check /dev/binder access before calling defaultServiceManager()'" am: 4f42ac7989
am: d16c37d5a0

Change-Id: I624ed23839a297b652701079aab7e6c091eefb4d