[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into qt-qpr1-dev am: 3c137d807d
-s ours am: dc1f295a59
-s ours am: e04ffe1aa1
-s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: I243cada343b07b06cb99833f9d1a64ed5be5f1d9
This commit is contained in: