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