[automerger skipped] Merge "Mark two unfinished APIs as "DO NOT USE"."
am:5e83291083-s ours am skip reason: change_id I3f06040fdda25c7aa27be45cd90177136f7e996f with SHA1bfa821b43ais in history Change-Id: I55f03b0345add230dde4a62fac5a38d7750b7a5d
This commit is contained in: