Merge remote-tracking branch 'caf/LA.BR.1.3.7_rb1.11' into lineage-15.1-caf-8952

Change-Id: Ib83bf7b19d1115a86fa5a5de3e6ded7929aeb34b