Merge "Support ContextWrapper by replacing instanceof checks with token...

Merge "Support ContextWrapper by replacing instanceof checks with token checks" into tm-qpr-dev am: 18964627 am: 2bc10d37

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



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