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