Merge "Remove throws RuntimeException from APIs" am: ad274e531a am: d07131cb98 am: 3e04c95255

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669005

Change-Id: I8c9661c382e757a458569810d519c3e0bbd2c0d2