Merge "Avoid sysfs name clashes." into sc-dev am: 6f7a5b8eb0 am: 68a06f5b23 am: 565d6d66de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14471783 Change-Id: I04fcd4015aad6c82cd44881f1053e41c6784bec8
This commit is contained in: