Merge changes from topic "revert-1218160-revert-1209453-aidl-lazy-presubmit-XWVUKGNUHY-QHKKSISBJD" am: 845e9ddfc2 am: 40f722c34f

Change-Id: I9ce740c9e67b86798f145556777a3d788c91d165