Test new upgrade steps am: 452223e20c am: 8766fb6473

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

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