Merge "libhwc2.1: reset LHBM state while entering AOD mode" into tm-qpr-dev