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