Merge "Make ATMService#mUiContext mockable" into tm-qpr-dev am: de5f0ae8 am: d0eb2c42

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



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