Merge branch 'android-msm-bonito-4.9' into android-msm-pixel-4.9

Bug: 119540871
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I88ea7093bae8c74da24914bbfa2db59a03c3707d