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