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