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