[automerger skipped] Merge "Add new intent to open NAS detail settings page in...

[automerger skipped] Merge "Add new intent to open NAS detail settings page in NAS app." into tm-qpr-dev am: 235ce54b am: b5c3bf56 -s ours

am skip reason: Merged-In I87361b640c5fc7b258e3e807e14baeab52a66953 with SHA-1 b2c2d1aa is already in history

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



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