Merge \"Fix FloatingActionButton auto offset functionality\" into nyc-support-24.1-dev
am: ff6b133ef5

Change-Id: I4059b0c3cb330b0423f5b85e00d373fe5ffe0d09