[automerger skipped] Merge "Security: Provide generated java sources." am: 2d56123a am: f56ef2c8 am: aa02923c -s ours

am skip reason: skip tag Change-Id If00e4dfc24bf776f87c7e2b2e3f42350aa4d4379 with SHA-1 65aa12e1 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1643002

Change-Id: I9afb14e33880873c3ac798f65e5d7a21610019cc