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