Merge "API review : use a range of numbers for OEM errors" into sc-dev am: c0f1de7c am: 363d3c5a

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

Change-Id: Ib03b679811e09dec05a57a39b5ec7b1fc85ea0ce