[automerger skipped] Merge "Remove hiddenapi-mappings and hiddenapi-list-docs." into rvc-dev am: a56084eaa5 am: 160f416c2b am: ac6af06bf2 am: d8141fdf39 -s ours
am skip reason: Change-Id If9dcac94eb077c6265c5acf5b3ce6d262db64f90 with SHA-1 7e7fdde3a5 is in history
Change-Id: I186c6812677b6e5295c0951bcea037f4e125945a
This commit is contained in: