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