Merge upstream master

Main changes:

* Remove support for token binding (which was never part of a platform
  release).
* Add no-arg constructors so they can be annotated.
* Some added new APIs that are not public for Android users.

Bug: 113148576
Test: cts -m CtsLibcoreTestCases
Change-Id: Ic415b63050a569aadd303c4a18f7df6486d9c2a4