Merge android-msm-floral-4.14-qt-qpr3 into android-msm-floral-4.14

SBMerger: 284775313
Change-Id: I608c261d543aae9d104e1981965a0ef2fe8b0695
Signed-off-by: SecurityBot <[email protected]>