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

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