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