[automerger skipped] Merge "Fix pendingIntent in SettingsSliceProvider could be Hijacked" into rvc-dev am: e8f1c6c814 am: 306f776fc3 am: a8c2f1cb3c am: 1f9854d781 -s ours
am skip reason: Change-Id Ie954d8a4b7153d6a4cac40621f363b45185990f2 with SHA-1 b3c0a2a6c1 is in history
Change-Id: I5ba50e275f98dd5304121af841a009fbda7bfaa3
This commit is contained in: