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