Revert "[STL] Address API council feedback on ApproachLayoutModi..."

Revert submission 3085486-cherrypicker-L33500030003548614:N45100030056225643

Reason for revert: Droidmonitor triggered revert due to build breakage in b/341363560. 

Reverted changes: /q/submissionid:3085486-cherrypicker-L33500030003548614:N45100030056225643

Change-Id: I04e20626d5c410e4dfd8d41a141af50a4df426f3
4 files changed