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