Merge "Avoid to hold a strong reference to Context object" into tm-qpr-dev am: 4f1ceac1

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



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