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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic057657bde7cfa45bad200d5e1a06330e650a2d4