Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867 Change-Id: I53c0555f4a325df7bddf2a309c02521716cbfd76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>