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