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