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

Change-Id: I394f70c2d40943cff5d45e845aafe6c49b5515a5