Merge "Adding @IgnoreUpTo for testOemPrivate" am: df86206d82

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

Change-Id: I92bd7437dede4ae4a4bb27dfbf68a5ae74553811