DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: 69ec1691d7
am: b370033f30

Change-Id: I7e24d384a1d1fd1164df9d4ded813be2bef697dd