Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043123

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