Merge "Switch the activity parameter to context." into udc-dev am: 4b3d41dc am: e765ec8b

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



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