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