tree 3f7d3ee79d3bca4c3c04a44185495db038b365ff
parent 8951d3f124a6d603f4b069d457c773f3ee0a3d62
parent f51ff6ed994c882fac877525a2727c12f81de35e
author Aaron Huang <huangaaron@google.com> 1647953381 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1647953381 +0000

Merge "Fix proto invalid write type" am: 0066692a4e am: f51ff6ed99

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005270

Change-Id: I30535ebd7f87a7b4c7f81194d70442955c530117