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