Merge android-msm-floral-4.14-rvc-qpr3 into android-msm-pixel-4.14

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