[automerger skipped] DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: acfebe21ac am: c789e737f8
am: 9a65c35a9f -s ours
am skip reason: subject contains skip directive

Change-Id: I501cb1b278861d0c3e6ebddf15972d158afaed5f