Merge "Revert "Add Extra Parameter for Intent"" into udc-dev am: 92181923b1 am: 2b652674ae

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

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