Merge branch 'android-msm-floral-4.14-qt-security-next' into android-msm-floral-4.14-qt

Nov 2019.1

Bug: 140747964
Change-Id: Ie4cf5aa25a07359b9b09e27c365049704acd1371
Signed-off-by: AleX Pelosi <apelosi@google.com>