Merge "Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev am: e4ecdb66d5 am: 134ef03161" into nyc-mr1-dev-plus-aosp