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