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