tree ad5669de5bb10cc65dc4de247bab74ded0464dc0
parent 88f7013aae14e817a205f407f7c4e1f9c50ea882
parent 4fbf3ab1ac09d9bf0c9bf8ef21e6b44d7f13d6a6
author Jordan Liu <jminjie@google.com> 1575621600 -0800
committer android-build-merger <android-build-merger@google.com> 1575621600 -0800

[automerger skipped] Move tests to .test package am: f24590f6c9 am: 6afec2ab78
am: 4fbf3ab1ac -s ours
am skip reason: change_id Ib10d694737ffa40c1eee063f8ac789a01dbdc7dd with SHA1 997ab0a71e is in history

Change-Id: I1c9d1900a660dc9c80cfa14d99cd30273def4200