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