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

Change-Id: Ic6d3b96cf86b33df96197a8a329e0e6ffae45979