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