Merge "OOB generateLocalOobData" am: 3a4f319145

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

Change-Id: I8317187de5b6a2d5d9ae4deb01509dd2e0fd4fef