Restore get/setExtras per API council feedback

These methods are still valuable enough they shouldn't be deprecated.

Bug: 173712888
Test: none
Change-Id: I47b46e0db95c0fb29c2a73fb5355d9f9ce21c6df
2 files changed