Merge \"leanback LM: Fix unnecessary prepended when there is margin\" into nyc-support-24.1-dev
am: 9669f73cb6

Change-Id: I47b13f63a100f5848eaba9f7545b173e2bd4f9d2