Merge mainline-release 6664920 to master - DO NOT MERGE am: 4d714b3c51 Original change: https://android-review.googlesource.com/c/platform/frameworks/ml/+/1430833 Change-Id: I267edd062e31ea108b7cd8b259ab3784b44ad729