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

[automerger skipped] Fix settings activity showing background bp when am: e1c25c18 -s ours am: 45d2b0b2 -s ours am: 843ad522 -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: I2753656b8cb06dc7880d9fd68cdcfe4949ce5583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>