Merge "Merge "[Bouncer] Add button for esim bouncer." into tm-qpr-dev am:...

Merge "Merge "[Bouncer] Add button for esim bouncer." into tm-qpr-dev am: 413bdfde" into tm-qpr-dev-plus-aosp am: 070d3a8e

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



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