Merge "Fix app compat dashboard from settings app" am: 4445b40a65 am: 770e30b1f9 am: 8879952967

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

Change-Id: Ie87c9ff8ae1e76bb667f7201e6314ec995d2e133