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