Merge "Fix App Compatibility Settings' lifecycle" am: 0ba498b226 am: 7e7924bf35

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2010296

Change-Id: I115858d668df4fe332b15081b1b68ed4768ad938