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

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

Change-Id: I49359b27fb64573129cec3b1a5fe345257956521