Merge "DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged" into stage-aosp-master am: 310bf06da5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15930695

Change-Id: Icda2875610fea73a69cea7056ad889b253df655f