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