BUG:31110244 Change-Id: I7fa727082cf996a17839680671b2c7f4bf027921 Reviewed-on: https://googleplex-android-review.git.corp.google.com/1405342 Reviewed-by: Stephen Li <stephenli@google.com> Presubmit-Verified: TreeHugger Robot <treehugger-gerrit@google.com>