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