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