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