Merge "Remove unused context variable" into sc-dev am: f45cdcd7 am: 1638bc3f am: b9785fe6

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

Change-Id: Ib3e646976d0822513444295145110a6b0b92a2a6