[automerger skipped] Merge "Avoid to hold a strong reference to Context...

[automerger skipped] Merge "Avoid to hold a strong reference to Context object" into tm-qpr-dev am: 4f1ceac1 am: 116f7c93 -s ours

am skip reason: Merged-In Id7b5e8617c521f31879199b0f2c7e18204bb7526 with SHA-1 c3380c16 is already in history

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



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