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