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

Change-Id: I243f8ed7525680a7f0ca310d2bf78e1908e1e224