Merge "Merge "Fix issue #28051399: API demos crashing on Remote service binding options" into nyc-dev am: 14e56c1aa6 am: 7bfe99a441" into nyc-mr1-dev-plus-aosp
am: 2c75f01201

* commit '2c75f01201a66e9e42583a630f78c24413a0615d':

Change-Id: I654bb8295a7b0776564d3365c78ef458480a247b