Merge "Replace Context @hide APIs" am: a1c0a06580 am: d5ee31aba5

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

Change-Id: Iea56458847be39665e7660f048eec88147be27c3