Bug: 378004423 Test: Manual Flag: EXEMPT bugfix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:33503e33c6b7dd05683d008f20aed265176c2b4c) Merged-In: I395abcad3d1751f311c3292cbec7545bac5b794e Change-Id: I395abcad3d1751f311c3292cbec7545bac5b794e