[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: If21132afaf33cb00d178be19fa63b4d1b3951866
This commit is contained in:
TreeHugger Robot
2020-03-20 03:43:31 +00:00
committed by Automerger Merge Worker

Diff Content Not Available