tree 12d39ca76a4c471947dac34ca00d358fa41143f1
parent 97cee9e5007c17cb83aec0b046494bf869531485
author Hall Liu <hallliu@google.com> 1579227647 -0800
committer Hall Liu <hallliu@google.com> 1579288204 -0800

Fill in partial cherry-pick

The cherry-pick of ag/9513538 to AOSP didn't include the manifest parts
and broke the 4636 menu in AOSP. Finishing the cherry-pick so that we
can use the debug menu again.

Bug: 123598192
Test: verify that the *#*#4636#*#* menu works
Change-Id: If1005e9175422f4ef64d9c810b06345987d3deea
Merged-In: I45ee1fc310274cd60e4a7af4728e6487555c11d8