tree 175c845aff7fb4ea851aaa893d978efd46ab15de
parent bf2fa2a8c3901a696aa0f2ce44079f258d379350
author Jeff Sharkey <jsharkey@android.com> 1620927364 -0600
committer Jeff Sharkey <jsharkey@android.com> 1620928136 -0600

Emergency workaround to patch over ID shuffling.

Bug: 188050150, 188011554
Test: manual
Change-Id: If865def2961b28d45b50a055272d8b24af7bbd32