[automerger skipped] Merge changes from topic "hidl-memory-java" am: 887aa66d0a am: e74637df68
am: dd682aacaf -s ours
am skip reason: change_id I85a46d37de7b89fb48c57f69b1552ca59b802c19 with SHA1 335114af79 is in history

Change-Id: Ic79fc04c1c90a8643976c1d024ae390e21d031dd