Merge "Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4 am: e3f595c0a4" into qt-r1-dev-plus-aosp