Merge changes from topic "UpsideDownCake-SDK-Finalization" into udc-dev am: 3a870e4db4 am: 8c9f526b2d

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

Change-Id: Ib2ec139d8daec453b804d59e8776a9cfd8f871db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>