[automerger skipped] Merge "OOB generateLocalOobData" am: 3a4f319145 am: bb6ea3457c am: 5a9fcc3d76 -s ours

am skip reason: skip tag Change-Id I2d4167a6c92ee0cc24da12df206838161c8f3318 with SHA-1 ba2c904f8d is already in history

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

Change-Id: Ie353ad0084ce116285dfef430a5c4d29ad5e3e56