Merge changes from topic "revert-1209453-aidl-lazy-presubmit-XWVUKGNUHY" am: f73651f6d2 am: 6959cc252f

Change-Id: I85c2631c15934d6aaa7aa506cad6e1c07b313af1