tree ad5669de5bb10cc65dc4de247bab74ded0464dc0
parent 87e8f452756562b11c47264f1a88db7bb2bb70d3
parent c0558dc2ce1e9c604621a09033d07e8b81215361
author Jordan Liu <jminjie@google.com> 1575534263 -0800
committer android-build-merger <android-build-merger@google.com> 1575534263 -0800

[automerger skipped] Add cleaned up unit tests moved from platform am: 35ef4b5382 am: 8acff00705
am: c0558dc2ce -s ours
am skip reason: change_id I9b88b2f84ddb4250a435aa9292224620c990bbaa with SHA1 c8e1239c6c is in history

Change-Id: Ice201af4a2e884330771f665669f1c88368d5903