Merge \"Fix inset edge of CoordinatorLayout\" into nyc-support-24.1-dev
am: 53ebbe2521

Change-Id: I023009d194102da5ba4608adeb7631db4c9fade5