Bug: 215434166 Ignore-AOSP-First: Merge conflict. Will cherry-pick to AOSP afterwards. Test: build, flash, device boot to home. Merged-In: I9ebedf8813cbfa30d979bc35a3b2306715be682b Change-Id: I9ebedf8813cbfa30d979bc35a3b2306715be682b
Bug: 215434166 Ignore-AOSP-First: Merge conflict. Will cherry-pick to AOSP afterwards. Test: build, flash, device boot to home. Merged-In: I9ebedf8813cbfa30d979bc35a3b2306715be682b Change-Id: I9ebedf8813cbfa30d979bc35a3b2306715be682b