Merge "3/ Fix inverted ShellInit dependency order (no functional changes)"...

Merge "3/ Fix inverted ShellInit dependency order (no functional changes)" into tm-qpr-dev am: 19aa0911 am: f6af8225

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19215131



Change-Id: I85780867a5574d62a8c3a0f1215ff7aa1a06db41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>