[automerger skipped] Fix settings activity showing background bp when am: 41261135 -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: I69e346e2cd8cc0dde8bc34d98387ee98218b91bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>