Merge "Log if waitForHwService has to wait too long."
am: a62432bf9b

Change-Id: Ib12f487a42c425f4cbbfef8f8c8110f04aa4b167