tree 0601942824617d08603d8cefb69e08f76da98971
parent 7934073e6d27fe7254f95e64c8c7aac5d587e807
parent c7f337aa823f29700cdbade26811d70fbf5c2d3d
author Treehugger Robot <treehugger-gerrit@google.com> 1610694659 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610694659 +0000

Merge "Fix test breakage caused by adding new capability by default" am: 57d097e484 am: c7f337aa82

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba52f2b470e28b7d6f28c1659eb3e3441f09daf6