[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814
am: 306f776fc3
am: 6d7acf94be
am: 7aebe40613
-s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 2fc9fed89c
is in history
Change-Id: I607e223ce57c31d28718fb8d07b3428b17aa8af5
This commit is contained in: