[automerger skipped] Merge "[Mainline] Add @hide. Revisit and redesign in S"...

[automerger skipped] Merge "[Mainline] Add @hide. Revisit and redesign in S" am: 8b3f6843 am: dde098b2 -s ours am: dc726b4e -s ours

am skip reason: Change-Id I9f301b65a3a476a114821c77916dbdb988e5d983 with SHA-1 cd7d9664 is in history

Change-Id: Iddff600825e48944f909e36c45f7564cb40b9a33