Merge changes from topic "ims_window" into tm-dev am: 7d195dbf am: e5251d73

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17393282



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