Merge "DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master" into stage-aosp-master
am: a2f4ac77fa

Change-Id: Idf5b62afce9314211ddc2cd3386a1cd97eeb303c