Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev...

Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev am: 2b40635f am: 73b2b137

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913078



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