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

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