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 am: 4d35e82a

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



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