[automerger skipped] Merge "Merge "fixes a security vulnerability in slice...

[automerger skipped] Merge "Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740f am: e3f595c0" into qt-r1-dev-plus-aosp am: ae7d884c -s ours
am: 7ba0126d -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92 is in history

Change-Id: I5c34b7bb6f5a1a4d94a6d23bf803aeb40d23d63e