[automerger skipped] Fix settings activity showing background bp when am: 6096c017 -s ours

am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 58d536c5 is already in history

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



Change-Id: I7667adf65b1acc0cf83f03f665e7b23f44b1a257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>