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