[automerger skipped] Merge "Adding action bar & styles to AdService Settings."...

[automerger skipped] Merge "Adding action bar & styles to AdService Settings." into tm-mainline-prod am: 72a71783 -s ours

am skip reason: Merged-In I63d9eb74ce1a0d514ffc956a81b1682ea7c7fac4 with SHA-1 1f7ece3a is already in history

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



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