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

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