Merge "Persist compat framework overrides across reboot" am: 51164692d0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b63f99caa3c384b994ea043c032b59a18a210de