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