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