Merge changes from topic "reland-binder-interface-stability" into stage-aosp-master
am: 10e4cc4a53

Change-Id: I2ed68b973a11caec0111f0df45131a2f293ccb4f