Test new upgrade steps am: 452223e20c

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

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