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