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

am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 0d67fca4 is already in history

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



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