Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b am: 2c2e65bd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947



Change-Id: I8a1102b3b9b95f513e86cb629d08d43609eed7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>