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