DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master
am: 39e93c8705

Change-Id: I752b3968894074bac69e72b50528c7d04c0f922b