[automerger skipped] Merge "Create a feature flag for Clear Calling" into...

[automerger skipped] Merge "Create a feature flag for Clear Calling" into tm-qpr-dev am: 9c04c0ad am: c236b057 -s ours

am skip reason: Merged-In I53f682fa63a6614037e966b5d8cc724d420dc065 with SHA-1 f5c54776 is already in history

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



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