Merge changes from topic "odm_dlkm" am: 3e31ec8392 am: 8c3a7ca939

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1363939

Change-Id: I8cdd4583c894d7fb5168fce1df789f2973a57357