Merge changes from topic "ons-sim-port" into tm-mainline-prod am: 9f65bccf

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



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