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

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

Change-Id: I947653ab33790724f2a419297c3fd7649ef4f2fb