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