Merge changes from topics "cherrypick-device_id_activity-jjzdpul0z9",...

Merge changes from topics "cherrypick-device_id_activity-jjzdpul0z9", "cherrypick-recreate-activity" into udc-dev am: a717b6e4

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



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