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