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