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