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