Merge "Fix downgrades on device with FRP enabled" into udc-dev am: 255c2994 am: 4d805d23

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



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