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