DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: f07d371513
am: 4cf7b483f7

Change-Id: I7e111ac58a16dce573304adbb10ea584eebf5a55