Merge "Remove the static application context fetcher" am: 35cbd1d5ee am: ac2bc495f5 am: 4afb2fa833 am: 9bdb13089e

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

Change-Id: I8b19d7075349a7b6f1daac7e917e0507df885413