Merge "Throw an exception in RoR api on no-pin case" am: 7444774737 am: 4d208ac97e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6399b2d5de8fdca4973c8cf4a435c22ba0e68d8