[automerger skipped] Merge "Add media-module-sdk build target." am: a6e369bb32 am: 8b6cd2dfe1 am: e85945fdd2 -s ours am: 4396a571a7 -s ours
am skip reason: Merged-In Ib37f2861a3c12526686b6ec78d9345aead6d51c9 with SHA-1 a2fd7fd012 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705354
Change-Id: I6facc5adcb6e00917302eebf391e9b445fa38645
This commit is contained in: