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