[automerger skipped] Merge "Clean up the Clear calling development feature...

[automerger skipped] Merge "Clean up the Clear calling development feature flag" into tm-qpr-dev am: 9f4d777d am: 07800e5c -s ours

am skip reason: Merged-In Ia0721c885fa26da7702acfe65e0c7b3011ee6595 with SHA-1 3c820cb8 is already in history

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



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