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