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

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



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