Merge "Remove jdemeulenaere from frameworks/base owners" am: e9caae60f0 am: feafd3a919

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

Change-Id: I16a77c13c189849baf4ce6b8f3f9001e3882ee3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>