Merge "Fix Activity leaks" into udc-dev am: 8e2eab4f

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



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