Merge "Set initial meta state to AMETA_NONE" into tm-dev am: 35f6eafffe am: 0c89ebe463

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17799857

Change-Id: If595a7eb5a327afc4c4c30b416a6663667fb92de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>