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

Change-Id: If2fafc23b7a0322200eadf0422b19466f60fb54e