Bug: 277258376 Bug: 270481978 Test: manually on Pixel & AOSP Change-Id: I1e0bbecf78290b85e464a4a5de658184eb91ca2c
22c608be4d
a27d94d75d