[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 087e60ca06
-s ours am: f225074bd0
-s ours am: e0ef60e5e5
-s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: I0c0df9dc21e55f1b7f5e8373cf78c18444c54af1
This commit is contained in: