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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75d7d427263d1c9c486b407de6102916b57d563c