[automerger skipped] Merge changes from topics "default_sub", "default_vonr"...

[automerger skipped] Merge changes from topics "default_sub", "default_vonr" am: af484af2 am: ed9f9366 am: eec891c6 -s ours

am skip reason: Merged-In Ic1cc924f7af934501a772323cb5e945cd5d88fe6 with SHA-1 50de0612 is already in history

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



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