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