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

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

Change-Id: I5a281e84d4c009fb0af9238f49a2e98dc9a7d17b