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

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

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



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