Merge "Merge "Increase the resize edge size to 48dp." into rvc-dev am: bbfdbb8a41 am: 6a4925db94" into rvc-d1-dev-plus-aosp