[automerger skipped] Merge "PolicyVersionUpgrader: fix ERROR + stacktrace on first boot" into main am: af5672fb am: 5a3c1bdc am: c9f6570d am: e0239039 am: 5a27fac6 -s ours

am skip reason: Merged-In Ib0322997848fd86734a9e1e660a60274cfc8f15e with SHA-1 a4e08889 is already in history

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



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