DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 73dba779b2 am: 0d5ffa548a

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

Change-Id: I481963a4a1c5fd23fa092abaef206c5f67c2488f