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