Merge "Remove fossilized upgrade code." into tm-dev am: c291627ea9 am: 4bb26ef6b0

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

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