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