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