DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 5c4d37fc17
am: e83c435a49

Change-Id: I8c41601f55bf10e6503b0133f44c1526946a66b3