Bug: 262796907 Test: TreeHugger build pass. Signed-off-by: Super Liu <supercjliu@google.com> Change-Id: I3dd73b9832c737f7c60639af649ae882e206aa15
Bug: 256521567 Test: adb bugreport Change-Id: I0da3eaac96b436e11444c2677b12b8947a4ddcef