This reverts commit 7d6704e4b07283b893b8ae07f7e92ad46a7f4187. The experiment has concluded, and we don't want these APIs in the finalized R api. Also update the newly-arrived module txt files. Bug: 149108482 Test: m checkapi Change-Id: I965111b9a8ad2d3e5849bd9dfdae9c00cc471ce6