Merge changes from topics "default_sub", "default_vonr" am: af484af2

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



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