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

Change-Id: I6e5500cd834d4ebe5ca78cc8fe3b2964f5d16932