[automerger skipped] Merge "Add settings intent dialog" into udc-dev am: cbbab3632c
am: 7b1a81e0a6
-s ours
am skip reason: Merged-In Id88cc7b3bf2829d075fbba87ea5dc0a245b9ae32 with SHA-1 9d74509888
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22181848
Change-Id: I2f55bb624e87ca47dac36f16275233389eb9b1a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: