Merge android-msm-barbet-4.19-rvc into android-msm-barbet-4.19

SBMerger: 351186807
Change-Id: I3990f271e62bbb745a4b6f867fd7055ea21e8532
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
Signed-off-by: Lucas Wei <lucaswei@google.com>