DO NOT MERGE - Fix bug 4489946 - Remove placeholder views for phones

in smaller-screen decor layouts.

Keep the internal id declared to keep code in sync with downstream
branches.

Change-Id: I25d2ff7c40c220ecc93b195dfd4e953fe0b4d944