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