tree 91669de8d712e376b9563c20cf8ebbf605834a4c
parent e6699a99b09b25c499800dd91883b9f0f4011855
author Weizhung Ding <weizhungding@google.com> 1578019723 +0800
committer Weizhung Ding <weizhungding@google.com> 1578540037 +0000

revert conflict commits from AU053

Drop the changes from 8.9.R1 and focus on 8.1.C9.

Bug: 146767069
Test: boot to home
Change-Id: I3a7d6a5e477912862fb48ed908a09f929612ec4b