Merge "Revert^2 "Merge branch 'upstream-master'"" am: 0aaab56eba

Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1613721

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb36f0ab322fcbeca1294ef0ab41ce064bbdaa7e