Merge changes from topic "odm_dlkm" am: 3e31ec8392

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

Change-Id: I9dc7cf009bd88e19f30b3ba0c8913bd6e25d71cd