Merge "Don't trampoline twice when opening security or privacy" into...

Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev am: 062b18c7 am: cf14410f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209765



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