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

SBMerger: 284775313
Change-Id: Iab16f51adba83fc6c92174a162d4bb1174073330
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>