Merge "Fix the order for boot scripts scanning" am: ccab04e5b5 am: 28d0dba1f5 am: 9a4f58b8d5

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

Change-Id: I767f9ed803b0db6f2737dcb0cf123166a9fc110b