Merge "Merge "Cache OverContext to prevent deadlock" into tm-dev am:...

Merge "Merge "Cache OverContext to prevent deadlock" into tm-dev am: 801e5c0d" into tm-mainline-prod am: 6d513cdb

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



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