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