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

[automerger skipped] Fix settings activity showing background bp when am: 5ce5bdd5 -s ours am: 8aeac421 -s ours am: cd87ea17 -s ours am: 04526580 -s ours

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

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



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