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