[automerger skipped] Fix settings activity showing background bp when am:...

[automerger skipped] Fix settings activity showing background bp when am: 41261135 -s ours am: 7b6ab415 -s ours am: 59f7b382 -s ours am: 7e487545 -s ours am: 9e3b24f4 -s ours

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

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



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