Merge "Switch to the new settings launch intent." into udc-dev am: 4cc64e9e34 am: 7425be05b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22598133 Change-Id: Ibebe536a98a2f5b9dd05be1019b2cb2edfd8b492 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: