Merge "Fix broken settings intent CTS test" into udc-dev am: c46dce4705 am: e0d0c22bd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339503 Change-Id: I48589acb44a673cebf5f238ce971178a36cd8125 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: