DO NOT MERGE - Merge QD1A.190821.011 into stage-aosp-master am: acfebe21ac
am: c789e737f8

Change-Id: I0dc7cbba09c4e1405c61e68442a43fe4d703bf0a