Merge "Use ActivityStarter to start Settings activity" into tm-qpr-dev am: b6ba2dcf

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



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