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

Change-Id: I8e1f9bdd35656fc521bc678275dd713e5f2e94c9