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

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



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