Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c

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

Change-Id: Idcbf693aa6336aea76c0fa7d97262132c0cdeb8a